GtkBookmarksManager: Ensure parent directory exists when saving
authorColin Walters <walters@verbum.org>
Thu, 9 May 2013 20:48:03 +0000 (16:48 -0400)
committerColin Walters <walters@verbum.org>
Thu, 9 May 2013 20:48:03 +0000 (16:48 -0400)
Otherwise we fail when the user doesn't have ~/.config yet.

gtk/gtkbookmarksmanager.c

index 91ccd89c2969f42628b5656455e5c8536c533b04..e475ea0756b3f831c7d7164953c2941a7422aef9 100644 (file)
@@ -115,6 +115,7 @@ save_bookmarks (GFile  *bookmarks_file,
   GError *error = NULL;
   GString *contents;
   GSList *l;
+  GFile *parent = NULL;
 
   contents = g_string_new ("");
 
@@ -136,16 +137,28 @@ save_bookmarks (GFile  *bookmarks_file,
       g_free (uri);
     }
 
+  parent = g_file_get_parent (bookmarks_file);
+  if (!g_file_make_directory_with_parents (parent, NULL, &error))
+    {
+       if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS))
+        g_clear_error (&error);
+       else
+        goto out;
+    }
   if (!g_file_replace_contents (bookmarks_file,
                                contents->str,
                                strlen (contents->str),
                                NULL, FALSE, 0, NULL,
                                NULL, &error))
+    goto out;
+
+ out:
+  if (error)
     {
       g_critical ("%s", error->message);
       g_error_free (error);
     }
-
+  g_clear_object (&parent);
   g_string_free (contents, TRUE);
 }